Merge 9.5.2+dfsg2-1 debian/* changes from experimental
authorDominique Belhachemi <domibel@debian.org>
Thu, 2 Oct 2025 21:31:41 +0000 (17:31 -0400)
committerDominique Belhachemi <domibel@debian.org>
Thu, 2 Oct 2025 21:31:41 +0000 (17:31 -0400)
20 files changed:
debian/changelog
debian/control
debian/copyright
debian/libvtk9-dev.install
debian/libvtk9-java.install
debian/libvtk9-qt-dev.install
debian/libvtk9.1t64-qt.lintian-overrides [deleted file]
debian/libvtk9.1t64.lintian-overrides [deleted file]
debian/libvtk9.3-qt.install [deleted file]
debian/libvtk9.3-qt.lintian-overrides [deleted file]
debian/libvtk9.3.install [deleted file]
debian/libvtk9.3.lintian-overrides [deleted file]
debian/libvtk9.5-qt.install [new file with mode: 0644]
debian/libvtk9.5-qt.lintian-overrides [new file with mode: 0644]
debian/libvtk9.5.install [new file with mode: 0644]
debian/libvtk9.5.lintian-overrides [new file with mode: 0644]
debian/python3-vtk9.install
debian/rules
debian/vtk9-doc.docs
debian/vtk9.install

index ae477233f18c19722601d3c730b97927c1165c0d..58735252ffa98c53dedee032217e06b75f1167bf 100644 (file)
@@ -1,7 +1,18 @@
 vtk9 (9.5.2+dfsg2-1) UNRELEASED; urgency=medium
 
-  * Team upload.
-  * New upstream release
+  * Team upload
+  * New upstream release 9.5.2+dfsg2
+  * Keep embedded viskores and scn sources
+  * Exclude embedded nlohmannjson/vtknlohmannjson sources
+  * d/copyright: Update files and licenses
+  * Raise minimum Java version from 8 to 11 (javac --release 11)
+  * Add nlohmann-json3-dev dependency
+  * Add PPC64 patch
+  * Lower optimization to -O1 on alpha to fix FTBFS
+  * Bump Standards-Version to 4.7.2
+  * Drop outdated patches
+  * Remove hardcoded compiler flags
+  * Switch to Qt6
 
  -- Dominique Belhachemi <domibel@debian.org>  Thu, 02 Oct 2025 16:23:47 -0400
 
index b0f1c287bf649747b6c3140152c1aaac8f6b4d5d..43c4f29fd59159d6551104138cd201d081877022 100644 (file)
@@ -57,21 +57,20 @@ Build-Depends: dpkg-dev (>= 1.22.5),
                libxpm-dev,
                libxt-dev,
                lzma,
+               nlohmann-json3-dev,
                mpi-default-dev,
                pkgconf,
                python3-dev,
                python3-matplotlib,
                python3-mpi4py,
-               qtbase5-dev,
-               libqt5opengl5-dev,
-               qtdeclarative5-dev,
+               qt6-base-dev,
                texlive-binaries,
                x11proto-core-dev,
                xauth,
                xvfb,
                zlib1g-dev,
                sqlite3
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
 Vcs-Browser: https://salsa.debian.org/science-team/vtk9
 Vcs-Git: https://salsa.debian.org/science-team/vtk9.git
 Homepage: https://www.vtk.org/
@@ -113,13 +112,14 @@ Depends: ${misc:Depends},
          libtheora-dev,
          libtiff-dev,
          libutfcpp-dev,
-         libvtk9.3 (= ${binary:Version}),
+         libvtk9.5 (= ${binary:Version}),
          libvtk9-java (= ${binary:Version}) [!hppa !hurd-any],
          libx11-dev,
          libxft-dev,
          libxml2-dev,
          libxss-dev,
          libxt-dev,
+         nlohmann-json3-dev,
          mpi-default-dev,
          python3-vtk9 (= ${binary:Version}),
          vtk9 (= ${binary:Version}),
@@ -134,7 +134,7 @@ Description: VTK header files
  This package provides the VTK header files required to compile
  C++ programs that use VTK to do 3D visualisation.
 
-Package: libvtk9.3
+Package: libvtk9.5
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -176,7 +176,7 @@ Description: VTK - Java language support
 Package: python3-vtk9
 Architecture: any
 Section: python
-Depends: libvtk9.3 (= ${binary:Version}),
+Depends: libvtk9.5 (= ${binary:Version}),
          python3-mpi4py,
          ${misc:Depends},
          ${python3:Depends},
@@ -197,7 +197,7 @@ Description: Python bindings for VTK
 Package: vtk9
 Architecture: any
 Section: interpreters
-Depends: libvtk9.3 (= ${binary:Version}),
+Depends: libvtk9.5 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: vtk9-doc,
@@ -237,7 +237,7 @@ Description: VTK examples
  .
  This package provides examples for VTK9
 
-Package: libvtk9.3-qt
+Package: libvtk9.5-qt
 Architecture: any
 Multi-Arch: same
 Section: libs
@@ -259,12 +259,10 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: libvtk9-dev (= ${binary:Version}),
-         libvtk9.3-qt (= ${binary:Version}),
+         libvtk9.5-qt (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
-         qtbase5-dev,
-         qttools5-private-dev,
-         libqt5opengl5-dev,
+         qt6-base-dev,
 Description: VTK header files, containing Qt files
  The Visualization Toolkit (VTK) is an open-source software system
  for 3D computer graphics, image processing, and visualization.
index b3597407182663270a1cd44e4bf34e6027907f5d..1f51528209ecffd82e9d2c03bf6dda5aaf9ebaca 100644 (file)
@@ -2,10 +2,10 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://www.vtk.org/
 Upstream-Name: Visualization Toolkit
 Files-Excluded:
-  Web/*
-  Examples/GUI/Win32
   ThirdParty/doubleconversion/vtkdoubleconversion
+  ThirdParty/eigen/vtkeigen
   ThirdParty/expat/vtkexpat
+  ThirdParty/fides
   ThirdParty/freetype/vtkfreetype
   ThirdParty/gl2ps/vtkgl2ps
   ThirdParty/hdf5/vtkhdf5
@@ -15,19 +15,18 @@ Files-Excluded:
   ThirdParty/libxml2/vtklibxml2
   ThirdParty/lz4/vtklz4
   ThirdParty/lzma/vtklzma
+  ThirdParty/mpi4py
   ThirdParty/netcdf/vtknetcdf
+  ThirdParty/nlohmannjson/vtknlohmannjson
+  ThirdParty/ogg/vtkogg
   ThirdParty/png/vtkpng
   ThirdParty/sqlite/vtksqlite
+  ThirdParty/theora/vtktheora
   ThirdParty/tiff/vtktiff
-  ThirdParty/zlib/vtkzlib
-  ThirdParty/glew/vtkglew
   ThirdParty/utf8/vtkutf8
-  ThirdParty/mpi4py
   ThirdParty/xdmf3
-  ThirdParty/ogg/vtkogg
-  ThirdParty/theora/vtktheora
-  ThirdParty/eigen/vtkeigen
-  ThirdParty/fides
+  ThirdParty/zlib/vtkzlib
+  Web
 
 Files: *
 Copyright: 1993-2015 Ken Martin, Will Schroeder, Bill Lorensen,
@@ -48,11 +47,11 @@ License: BSD-2-clause
 Files: Common/DataModel/vtkDistributedGraphHelper.cxx
  Common/DataModel/vtkDistributedGraphHelper.h
 Copyright: Ken Martin, Will Schroeder, Bill Lorensen
-License: BSL-1
+License: BSL-1.0
 
 Files: Examples/Android/NativeVTK/*
 Copyright: 2010, The Android Open Source Project
-License: Apache-2
+License: Apache-2.0
 
 Files: Filters/General/vtkTemporalPathLineFilter.cxx
 Copyright: CSCS - Swiss National Supercomputing Centre.
@@ -69,13 +68,14 @@ License: BSD-3-clause
 
 Files: Interaction/Widgets/Testing/Cxx/*
 Copyright: Ken Martin, Will Schroeder, Bill Lorensen
-License: Apache-2
+License: Apache-2.0
 
 Files: ThirdParty/diy2/vtkdiy2/*
-Copyright: 2016-2018, Chobolabs Inc.
-License: BSD-3-clause
+Copyright: 2015, The Regents of the University of California, through
+ Lawrence Berkeley National Laboratory
+License: BSD-3-clause-LBNL
 
-Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/fmt/*
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/fmt/*
 Copyright: 2012-2016, Victor Zverovich
 License: BSD-like
   Permission is hereby granted, free of charge, to any person obtaining
@@ -104,6 +104,28 @@ License: BSD-like
   source code, you may redistribute such embedded portions in such object form
   without including the above copyright and permission notices.
 
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/itlib/*
+Copyright:
+ 2016-2018 Chobolabs Inc.
+ 2020-2022 Borislav Stanimirov
+License: MIT
+
+Files: ThirdParty/diy2/vtkdiy2/include/vtkdiy2/thirdparty/thread/*
+Copyright: 2010-2012 Marcus Geelnard
+License: Zlib
+
+Files:
+ ThirdParty/glad/vtkglad/include/EGL/eglplatform.h
+ ThirdParty/glad/vtkglad/include/KHR/khrplatform.h
+Copyright: 2007-2020 The Khronos Group Inc.
+License: Apache-2.0
+
+Files:
+ ThirdParty/glad/vtkglad/include/glad/*
+ ThirdParty/glad/vtkglad/src/*
+Copyright: 2013-2020 David Herberth
+License: MIT
+
 Files: ThirdParty/kissfft/vtkkissfft/*
 Copyright: 2003-2010, Mark Borgerding .
 License: BSD-3-clause
@@ -123,6 +145,19 @@ Files: ThirdParty/pugixml/vtkpugixml/*
 Copyright: 2006-2016, Arseny Kapoulkine
 License: Expat
 
+Files: ThirdParty/scn/vtkscn/*
+Copyright: 2017 Elias Kosunen
+License: Apache-2.0
+
+Files: ThirdParty/scn/vtkscn/include/vtkscn/scan.h
+Copyright: 2017 Elias Kosunen
+           2018 Tristan Brindle
+License: Apache-2.0 AND BSL-1.0
+
+Files: ThirdParty/token/vtktoken/*
+Copyright: 2020-2023, Kitware, Inc.
+License: BSD-3-clause
+
 Files: ThirdParty/vpic/*
 Copyright: 2007, Los Alamos National Security, LLC
 License: BSD-3-clause
@@ -131,10 +166,6 @@ Files: ThirdParty/xdmf2/vtkxdmf2/*
 Copyright: 1984, 1989, 1990, 2000-2003, Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: ThirdParty/zfp/vtkzfp/*
-Copyright: 2014-2019, Lawrence Livermore National Security, LLC.
-License: BSD-3-clause-notice
-
 Files: Utilities/DICOMParser/*
 Copyright: 2003, Matt Turek
 License: BSD-3-clause
@@ -149,11 +180,11 @@ License: Zlib
 
 Files: Utilities/Maintenance/*
 Copyright: Insight Software Consortium
-License: Apache-2
+License: Apache-2.0
 
 Files: Utilities/MetaIO/*
 Copyright: 2000-2011, Insight Software Consortium
-License: Apache-2
+License: Apache-2.0
 
 Files: ThirdParty/cli11/*
 Copyright: 2017-2019 University of Cincinnati, developed by Henry
@@ -175,7 +206,7 @@ Files: ThirdParty/h5part/vtkh5part/*
 Copyright: 2006-2009, The Regents of the University of California
 License: BSD-3-clause-notice-2
 
-Files: ThirdParty/fast_float/vtkfast_fload/*
+Files: ThirdParty/fast_float/vtkfast_float/*
 Copyright: 2021, fast_float authors
 License: Expat
 
@@ -189,6 +220,48 @@ License: public-domain
  That being said, I would appreciate credit! If you find Loguru useful, tweet me
  at @ernerfeldt mail me at emil.ernerfeldt@gmail.com.
 
+Files: ThirdParty/viskores/vtkviskores/*
+Copyright: 2025 Kitware Inc.,
+ National Technology & Engineering Solutions of Sandia, LLC (NTESS),
+ UT-Battelle, LLC.,
+ Los Alamos National Security, LLC.
+License: Viskores-1.0
+  Viskores License Version 1.0
+  Under the terms of Contract DE-NA0003525 with NTESS, the U.S. Government
+  retains certain rights in this software.
+  .
+  Under the terms of Contract DE-AC52-06NA25396 with Los Alamos National
+  Laboratory (LANL), the U.S. Government retains certain rights in
+  this software.
+  .
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are
+  met:
+  .
+  * Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+  .
+  * Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+  .
+  * Neither the name of Kitware nor the names of any contributors may
+    be used to endorse or promote products derived from this software
+    without specific prior written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR
+  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+  EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+  LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-3-clause
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are met:
@@ -239,7 +312,7 @@ License: BSD-2-clause
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: BSL-1
+License: BSL-1.0
   Boost Software License - Version 1.0 - August 17th, 2003
   .
   Permission is hereby granted, free of charge, to any person or organization
@@ -264,10 +337,10 @@ License: BSL-1
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.
 
-License: Apache-2
+License: Apache-2.0
   On Debian systems, the full text of the Apache
   License version 2 can be found in the file
-  `/usr/share/common-licenses/Apache-2'.
+  `/usr/share/common-licenses/Apache-2.0'.
 
 License: Zlib
   This software is provided 'as-is', without any express or implied warranty.
@@ -453,3 +526,39 @@ License: BSD-3-clause-notice-2
   other computer software, distribute, and sublicense such enhancements or
   derivative works thereof, in binary and source code form.
 
+License: BSD-3-clause-LBNL
+  Redistribution and use in source and binary forms, with or without modification,
+  are permitted provided that the following conditions are met:
+  .
+  (1) Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+  .
+  (2) Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.
+  .
+  (3) Neither the name of the University of California, Lawrence Berkeley National
+  Laboratory, U.S. Dept. of Energy nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific prior
+  written permission.
+  .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+  ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  .
+  You are under no obligation whatsoever to provide any bug fixes, patches, or
+  upgrades to the features, functionality or performance of the source code
+  ("Enhancements") to anyone; however, if you choose to make your Enhancements
+  available either publicly, or directly to Lawrence Berkeley National Laboratory,
+  without imposing a separate written license agreement for such Enhancements,
+  then you hereby grant the following license: a  non-exclusive, royalty-free
+  perpetual license to install, use, modify, prepare derivative works, incorporate
+  into other computer software, distribute, and sublicense such enhancements or
+  derivative works thereof, in binary and source code form.
index a70f8b549b6afc9efff38fa1df5f5d3c16c777f5..d58ebf3ff4a1f4cae02b7be791c48610f9c39bf8 100644 (file)
@@ -1,3 +1,3 @@
-usr/include/vtk-9.3 usr/include
+usr/include/vtk-9.5 usr/include
 usr/lib/*/*.so
-usr/lib/*/cmake/vtk-9.3
+usr/lib/*/cmake/vtk-9.5
index 5045897e2aa4c3385757c33e2e95b61603e3c2ea..97a0604bdc96ba3156c277b7e5b42cfbf2c53106 100644 (file)
@@ -1,4 +1,4 @@
-usr/bin/vtkParseJava-9.3                    usr/bin
-usr/bin/vtkWrapJava-9.3                     usr/bin
+usr/bin/vtkParseJava-9.5                    usr/bin
+usr/bin/vtkWrapJava-9.5                     usr/bin
 usr/lib/*/java/vtk9.jar                     usr/share/java
 usr/lib/*/java/vtk-L*
index 5dec2fe6d0f509d3772fc354a7269f4b6e86fb3b..c1999e24b8713aa129df24237cd6f225c6d340a4 100644 (file)
@@ -1,3 +1,3 @@
 usr/lib/*/*Qt*.so
-usr/include/vtk-9.3/*Qt*
-usr/include/vtk-9.3/Q*
+usr/include/vtk-9.5/*Qt*
+usr/include/vtk-9.5/Q*
diff --git a/debian/libvtk9.1t64-qt.lintian-overrides b/debian/libvtk9.1t64-qt.lintian-overrides
deleted file mode 100644 (file)
index b0273f5..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-libvtk9.1t64-qt: package-name-doesnt-match-sonames
-libvtk9.1t64-qt: package-name-doesnt-match-sonames libvtk9.1-qt
diff --git a/debian/libvtk9.1t64.lintian-overrides b/debian/libvtk9.1t64.lintian-overrides
deleted file mode 100644 (file)
index d9ce053..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-libvtk9.1t64: package-name-doesnt-match-sonames
-libvtk9.1t64: package-name-doesnt-match-sonames libvtk9.1
diff --git a/debian/libvtk9.3-qt.install b/debian/libvtk9.3-qt.install
deleted file mode 100644 (file)
index 4c7a2dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*Qt*.so.*
diff --git a/debian/libvtk9.3-qt.lintian-overrides b/debian/libvtk9.3-qt.lintian-overrides
deleted file mode 100644 (file)
index 6aad1a0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libvtk9.3-qt: package-name-doesnt-match-sonames
diff --git a/debian/libvtk9.3.install b/debian/libvtk9.3.install
deleted file mode 100644 (file)
index 5ff38e4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/lib/*/vtk-9.3
diff --git a/debian/libvtk9.3.lintian-overrides b/debian/libvtk9.3.lintian-overrides
deleted file mode 100644 (file)
index fdec73b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-libvtk9.3: package-name-doesnt-match-sonames
diff --git a/debian/libvtk9.5-qt.install b/debian/libvtk9.5-qt.install
new file mode 100644 (file)
index 0000000..4c7a2dd
--- /dev/null
@@ -0,0 +1 @@
+usr/lib/*/*Qt*.so.*
diff --git a/debian/libvtk9.5-qt.lintian-overrides b/debian/libvtk9.5-qt.lintian-overrides
new file mode 100644 (file)
index 0000000..86d1aeb
--- /dev/null
@@ -0,0 +1 @@
+libvtk9.5-qt: package-name-doesnt-match-sonames
diff --git a/debian/libvtk9.5.install b/debian/libvtk9.5.install
new file mode 100644 (file)
index 0000000..5699f2a
--- /dev/null
@@ -0,0 +1,2 @@
+usr/lib/*/*.so.*
+usr/lib/*/vtk-9.5
diff --git a/debian/libvtk9.5.lintian-overrides b/debian/libvtk9.5.lintian-overrides
new file mode 100644 (file)
index 0000000..f335f43
--- /dev/null
@@ -0,0 +1 @@
+libvtk9.5: package-name-doesnt-match-sonames
index 7cd1d4ae8c120d30559995945fe9b3716e3981fe..162f73dc7c63ae50698e4ddeb4bdb6dc8763bda1 100644 (file)
@@ -1,5 +1,5 @@
 usr/lib/python3
 usr/bin/pvtkpython
-usr/bin/vtkpython-9.0
-usr/bin/vtkWrapPython-9.3
-usr/bin/vtkWrapPythonInit-9.3
+usr/bin/vtkpython
+usr/bin/vtkWrapPython-9.5
+usr/bin/vtkWrapPythonInit-9.5
index a607f6af7a38257105139f94ad654a7f332e04da..d330e4e71e2cfb310ccaf6ea092b8bd03191f424 100755 (executable)
@@ -8,6 +8,8 @@ nojava_os=hurd
 ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os)))
   export JAVA_HOME=/usr/lib/jvm/default-java
   extra_flags += -DVTK_WRAP_JAVA=ON
+  # increase java version from 8 to 11 to remove many warnings
+  extra_flags += -DVTK_JAVA_RELEASE_VERSION:STRING=11
 endif
 
 ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
@@ -23,25 +25,24 @@ else
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP"
 endif
 
+# Work around FTBFS on Alpha (assembler error "No lda !gpdisp!")
+ifneq (,$(filter $(DEB_HOST_ARCH),alpha))
+  export DEB_CXXFLAGS_MAINT_APPEND += -O1
+endif
+
 %:
        dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
 
 extra_flags +=  \
        -DBUILD_SHARED_LIBS=ON \
-       -DCMAKE_C_COMPILER=mpicc \
-       -DCMAKE_CXX_COMPILER=mpic++ \
-       -DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -latomic" \
-       -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed" \
-       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed" \
-       -DCMAKE_VERBOSE_MAKEFILE=ON \
        -DHDF5_IS_PARALLEL=OFF \
        -DVTK_BUILD_DOCUMENTATION=ON \
        -DVTK_BUILD_EXAMPLES=OFF \
        -DVTK_BUILD_TESTING=OFF \
        -DVTK_EXTRA_COMPILER_WARNINGS=ON \
-       -DVTK_GROUP_ENABLE_Qt:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL:STRING="NO" \
        -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick:STRING="DONT_WANT" \
+       -DVTK_GROUP_ENABLE_Qt:STRING="YES" \
        -DVTK_GROUP_ENABLE_Rendering:STRING="YES" \
        -DVTK_GROUP_ENABLE_StandAlone:STRING="YES" \
        -DVTK_GROUP_ENABLE_Views:STRING="YES" \
@@ -49,24 +50,25 @@ extra_flags +=  \
        -DVTK_GROUP_ENABLE_Imaging:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_IOGeoJSON:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_RenderingQt:STRING="YES" \
-       -DVTK_MODULE_ENABLE_VTK_RenderingTk:STRING="YES" \
+       -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES \
        -DVTK_MODULE_ENABLE_VTK_utf8:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_InteractionWidgets:STRING="YES" \
        -DVTK_MODULE_ENABLE_VTK_InteractionImage:STRING="YES" \
+       -DVTK_MODULE_ENABLE_VTK_ParallelMPI:STRING="YES" \
        -DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_eigen:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_expat:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_freetype:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=ON \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_glew:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_hdf5:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_jpeg:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_jsoncpp:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_libproj:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_libxml2:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_lz4:BOOL=ON \
-       -DVTK_MODULE_USE_EXTERNAL_VTK_lzma:BOOL:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_lzma:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_netcdf:BOOL=ON \
+       -DVTK_MODULE_USE_EXTERNAL_VTK_nlohmannjson:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_ogg:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_png:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_sqlite:BOOL=ON \
@@ -74,15 +76,9 @@ extra_flags +=  \
        -DVTK_MODULE_USE_EXTERNAL_VTK_tiff:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_utf8:BOOL=ON \
        -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON \
-       -DVTK_USE_TK=OFF \
        -DVTK_WRAP_PYTHON=ON \
-       -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES \
-       -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-       -DVTK_MODULE_ENABLE_VTK_ParallelMPI:STRING="YES" \
        -DVTK_USE_MPI=ON \
-       -DVTK_JAVA_SOURCE_VERSION:STRING=1.8 \
-       -DVTK_JAVA_TARGET_VERSION:STRING=1.8 \
-
+       -DVTK_QT_VERSION=6
 
 override_dh_auto_configure:
        dh_auto_configure -- $(extra_flags)
@@ -100,15 +96,15 @@ ifneq ($(JAVA_HOME),)
        # Correct headers for paraview
        mv $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk.jar $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/java/vtk9.jar
 endif
-       sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.3/VTK-targets.cmake
+       sed -i -e "s/FATAL_ERROR/STATUS/g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/vtk-9.5/VTK-targets.cmake
 
 execute_after_dh_install:
        rm -rf $(CURDIR)/debian/tmp/usr/share/licenses
        find $(CURDIR)/debian/libvtk9-dev/ -name "*Qt*" -exec rm {} \; || true
        find $(CURDIR)/debian/libvtk9-dev/ -name "libvtkRenderingPythonTkWidgets.so" -exec rm {} \; || true
        find $(CURDIR)/debian/libvtk9-dev/usr/include/ -name "Q*" -exec rm {} \; || true
-       find $(CURDIR)/debian/libvtk9.3/ -name "*Qt*" -exec rm {} \; || true
-       find $(CURDIR)/debian/tmp/usr/share/doc/vtk-9.0/doxygen -name "_formulas.log" -exec rm {} \; || true
+       find $(CURDIR)/debian/libvtk9.5/ -name "*Qt*" -exec rm {} \; || true
+       find $(CURDIR)/debian/tmp/usr/share/doc/vtk-9.5/doxygen -name "_formulas.log" -exec rm {} \; || true
        find $(CURDIR)/debian/build/Utilities/Doxygen/doc/html -name "_formulas.log" -exec rm {} \; || true
 
 # Fix privacy breach
index 9944435315b1b5f0074644595562c353c7b74f06..da1a4bff1d90966bc1f79700a3dc3e6f60f3c6fa 100644 (file)
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/doc/vtk-9.3/doxygen
+debian/tmp/usr/share/doc/vtk-9.5/doxygen
 debian/build/Utilities/Doxygen/doc/html
index ddb49e7c9bef626d6792d1d5f7d04cfbfd7b0742..a87abdb62d1bdc67f5f446c8488abde21108e320 100644 (file)
@@ -1,2 +1,3 @@
-usr/bin/vtkWrapHierarchy-9.3
-usr/bin/vtkProbeOpenGLVersion-9.3
+usr/bin/vtkWrapHierarchy-9.5
+usr/bin/vtkProbeOpenGLVersion-9.5
+usr/bin/vtkWrapSerDes-9.5